Revert 6eef7bf..818e04a

This rolls back to commit 6eef7bf5a1add8a6382bcf083d90a4973bf05331.