Revert cba0723..11b5217

This rolls back to commit cba07236fd75f27d223f5fb4d7a72668b7f88ea2.