Revert b2825f6..24443f4

This rolls back to commit b2825f6663eaf3a8ae8bbd195d452a74a734b9a5.