Revert ee0cf9e..5badadb

This rolls back to commit ee0cf9e2cd8c653b9be18f9184edcdc13afc1304.