Revert 31320ca..bdf1c31

This rolls back to commit 31320ca3cde42db9658368e65cf1ca3ff8530d9c.