Revert 538b284..98c84d7

This rolls back to commit 538b2840bc5eb72b5a2dcf6c6d3089093e65d023.