Revert aa06d0d..c35b662

This rolls back to commit aa06d0daf7cde7c72045460ee125a6b4db76fef3.