Revert 7c96f63..de74096

This rolls back to commit 7c96f6340e42a3234b4d9579022c78275031b985.