Revert 71e5f5d..e1690a9

This rolls back to commit 71e5f5daa5d8b5c174685fc63a081b96cb30177d.
Final bit of rollback shenanigans