Revert a2e01ed..ce1304a

This rolls back to commit a2e01edbbc37fea1537b72c471465508f0eefaf6.