Revert 38b0084..dd85069

This rolls back to commit 38b0084b718c115c5e446143ee56d0da9ed7a410.