Revert bf2258e..0515b72

This rolls back to commit bf2258e693efaf8f4c672a370eafd246142ebade.