Revert 7203b30..38c0eb5

This rolls back to commit 7203b301ea1d36dee1114f5fdb13088f14a8b88a.