Revert aba5c5f..eda4d0d

This rolls back to commit aba5c5f4018a91beb0e5f4da2d852ead2d5dd8dc.