Revert 1e23591..fc46a90

This rolls back to commit 1e235918e5a3425c56bd7ab01e01790665c61acb.