Revert cdf6468..8b9b22d

This rolls back to commit cdf6468b32187fbdb935f0ff99012f48072dfcbb.