Revert 2d6e73e..30ef8d6

This rolls back to commit 2d6e73ef8bf7423195e63d77e5b4e611cba26e4c.