Revert ab3137c..d1ea4c5

This rolls back to commit ab3137c1ae9809a838882cad7212b0ff6cee1198.