Revert f3a3eab..a7b84aa

This rolls back to commit f3a3eab04e9cfd3223d1e0c3b44db31f4172033d.