Revert 43d63fc..db09051

This rolls back to commit 43d63fc54d305086e3a1a05ae969af7eda9c9f8a.