Revert f9b86df..ca9b8c7

This rolls back to commit f9b86df42a9b0958e750abe7cc3e6bdb02344d15.