Revert ff4e694..5a0b12a

This rolls back to commit ff4e694231351b5c32c552e18203d039276fed8f.