Revert 2922d1e..ee9e510

This rolls back to commit 2922d1e4cd13df61ab937f5348f8d0d3896ac531.