Revert 6eb5555..e777265

This rolls back to commit 6eb5555533c082a1990581de74b7f583d5f786ac.