Revert ae2be07..45dad28

This rolls back to commit ae2be07247a8e98f16d5af71eb1a5bd7824c1f5d.