Revert f8e0392..e3eaf3c

This rolls back to commit f8e03926ae7b97330d18429480e8ae38aaedc989.