Revert c4f5213..5418272

This rolls back to commit c4f52136b6064eeb5fab61bfe3b1dce98fbbbb70.