Revert eca2f4c..a39b22c

This rolls back to commit eca2f4c712c4547ad9b6b9e3403a065244f13d62.