Revert 0076955..c9276d8

This rolls back to commit 0076955a08ab01ec668235616e121b6f4bbd03a0.