Revert bae0c40..7b2151b

This rolls back to commit bae0c40edbf0fbefea3cd7b96bca114d239416ac.