Revert 7775bfb..15d924b

This rolls back to commit 7775bfbd4ab1be93ce150960a8519df782bfb55f.