Reopens #3414 This reverts commit 99d368673b4fbd640b15fe85e5c9af52179dc749, reversing changes made to 8bf9037bbc.
8bf9037bbc