Revert 47ce606..099175d

This rolls back to commit 47ce6062a8b9324eac896d0feb6ca6cc55a319c1.