Revert d617de6..1d8eedb

This rolls back to commit d617de67506b1142c23e3f92c9a8846f2f4dfb14.
quick