Revert 049498b..9c7ad7c

This rolls back to commit 049498b34ce90b7288e27bc47dc2f58aef8356cf.