Revert d4438ca..e6e48db

This rolls back to commit d4438cad3db2f603321b2651038eed2cbca2bc99.