Revert 1afb5b2..59e401e

This rolls back to commit 1afb5b2bd758d1a455527bdbaa438d6a87822789.