Revert fb0b7f8..e9f79f5

This rolls back to commit fb0b7f88fcf7700eedc78bedd23be1b9e62652f0.