Revert 232ced8..ab91acb

This rolls back to commit 232ced8ac4e7aa1ac542a6b839039510d7a29ca4.