Revert 6128cc7..b82eb7a

This rolls back to commit 6128cc745a8956c6606a153f50f28da113327f18.