Revert 95eaedc..2ed1b5c

This rolls back to commit 95eaedcc26e55625656768673c345de81facc6d3.