Revert ee5d049..4b04b55

This rolls back to commit ee5d04906d103431c337cc7ad31cc1e065a052db.