Revert d0553ec..a48c711

This rolls back to commit d0553ecba8f4b8e0047fbb3afc936489cb1159b9.