Revert f0ba2a3..043947e

This rolls back to commit f0ba2a31ec0acb0767c23eedd3202d25c95027f7.