Revert 38b36f9..5fdc95d

This rolls back to commit 38b36f9fe27afe65c479f7744ade189587ef0c6c.