Revert f497231..1a6111f

This rolls back to commit f497231b926250b086b6d003621bd161e5eaaf81.