Revert b04c318..8f0a879

This rolls back to commit b04c318212639f354aeeb40fb396731707ac4c62.