Revert 4b8f1b9..72406b8

This rolls back to commit 4b8f1b941e978725562fb4441bc991d815fff4f9.