Revert e28cdba..5facdb9

This rolls back to commit e28cdbaa22630e2707b0f3789e20c478326954e9.