Revert 11759c2..ac1b679

This rolls back to commit 11759c27e837f4dca624d7edf43c4cd6d4167a19.