Revert fb6d77a..c968cff

This rolls back to commit fb6d77aabb622bf1ad67c32f5d841b124d5a4726.