Revert 2516dea..d5fdec3

This rolls back to commit 2516dea45fdbe96c36c07e90bc5b43920c94d7a2.