Revert bdf0290..46d3e09

This rolls back to commit bdf029095cf9fabd77dea57293b6e0e8e5173a46.