Revert 2d239f3..ae234fb

This rolls back to commit 2d239f3e5e013cef6cec728f093344d0f63f98b5.