Revert f9c236b..c542195

This rolls back to commit f9c236b930443eeabc4ad2e9b15c81955a93a043.