Revert bf6a93d..5f06a9f

This rolls back to commit bf6a93d9afe3b7457d0e0ab4ebc121dfec3b4094.