Revert ba91f28..8f1f98a

This rolls back to commit ba91f2813ce9859cd21fae38082bd8f54d0904a6.