Revert f67cbcb..58541f7

This rolls back to commit f67cbcbbac606312ccc41b801415da99737be502.