Revert 582704c..56a9b0a

This rolls back to commit 582704c2dc71f4586e9d57a9b05b0e0f46f2ac7d.