Revert c565ed0..2487fa0

This rolls back to commit c565ed0e666af38ce104e8213dbb4e78a42266e3.