Revert 5242b2e..96897c9

This rolls back to commit 5242b2e06871dfd1edf85d1519ff268d8540455d.