Revert eb34ab2..add934f

This rolls back to commit eb34ab2ef307da264c5f8d7bc4b894be3c367b33.