Revert 3dec384..fd827ab

This rolls back to commit 3dec384de7b598f414b41aa9f7d47a02cbbf86d3.