Revert 3abd945..b73dc5a

This rolls back to commit 3abd945c19f9bd84ae9588b93a06066a3450811a.