Revert 237efa4..1480edf

This rolls back to commit 237efa4538b062d2f1c4f5c2ff102c7f00992d54.