Revert 0e4a9b4..c97283e

This rolls back to commit 0e4a9b4f876dfd0f4e05a1bd84e763e4fc3d7ff8.