Revert 48d8fa6..dd84260

This rolls back to commit 48d8fa68ea8aefe2dc072ccd4440cc5e99c957e7.