Revert f5f2d2a..4767033

This rolls back to commit f5f2d2aca05d4d413956d4002d3014189e77b881.