Revert f97949e..ec8c6c0

This rolls back to commit f97949ebce5f232c622f323c79ea7ed3691630fa.