Revert 7388187..0f7c9ba

This rolls back to commit 7388187ad0296201acdae1fcbb23728876cbf894.