Revert 7276ce3..3d16a0c

This rolls back to commit 7276ce3a0135dfd677322c1732b477ec223a98a1.