Revert 3082816..1ba31d5

This rolls back to commit 308281695478447a820115eafc8fcc843fe2a038.