Revert f1b6eb7..d315664

This rolls back to commit f1b6eb7cca5bbcfa7e4eda1c3baf8ad3b4a4d0e0.