Revert 785bfc7..543337c

This rolls back to commit 785bfc7cf6f3715f684941adea086919bc6f5d01.