Revert 366d83f..c9eb2f1

This rolls back to commit 366d83fe2f454a6c41b3458270a218c78ad0d9d3.