Revert 2166ff4..f87e54a

This rolls back to commit 2166ff4320e9e11c6f257e76916e303aa3678e10.