Revert cd4f43a..3177c5a

This rolls back to commit cd4f43af92dedfb2141e7c22fed48c75d3a162a2.