Revert bcb3e45..3d2443a

This rolls back to commit bcb3e454c2c412e5f99df0c231069e3db03fd53e.