Revert 7266195..d82c9ed

This rolls back to commit 7266195913cd50ec3b74c74b4f9787af578fc545.