Revert 467a139..2a1f70a

This rolls back to commit 467a13948794079cf45f46b21fb14f2a8774b4bb.