Revert 11f11d7..fba1b01

This rolls back to commit 11f11d7475b35f6ec92ba570700144bd47f55986.