Revert 541980c..9ab99a8

This rolls back to commit 541980c7feb832a633e6fef022a078a27fd20dde.