Revert 54d8aa0..1a2ab97

This rolls back to commit 54d8aa0b9268f3089d10e94feccdd378eaee283d.