Revert 7be422c..6ea8db6

This rolls back to commit 7be422c72fc8769e33bdc6a6017b5bb89991ce9c.
safe