Revert 7480035..8c03379

This rolls back to commit 7480035376d32857e3b987500c4a4c3aab179f1b.