Revert a2f5e06..1443a11

This rolls back to commit a2f5e06f8d3e0eba1c10e1843f5db0e5581b33c3.