Revert 905cd5f..cdbef94

This rolls back to commit 905cd5f6c8b03e197197454953c01ee3c52b1be1.