Revert 0176ed5..a785ce0

This rolls back to commit 0176ed5e3f87d557b39e067fcf5230a673f148b4.