Revert f271ff8..2b2d4fc

This rolls back to commit f271ff865cab589c40a1f837f23dd84263b522d4.