Revert 71721e6..c21ae0f

This rolls back to commit 71721e67f54057e20a6c09b7fcdf523225b33e6b.
Last try.