Revert f014b01..d2199c4

This rolls back to commit f014b0182053f6404506aecd4077c6ec778b2798.