Revert dbb6220..245f0a3

This rolls back to commit dbb6220d5f0a5dca01d141aeaf3b395f06fce0d8.