Revert bbea46d..0bf28d2

This rolls back to commit bbea46d545022a3d056fbb3ae270a2d81cfcac3e.