Revert 2295fc6..3bc111b

This rolls back to commit 2295fc6d3c86a7313d719405bd054a599e477436.