Revert a4bae62..abd8fa4

This rolls back to commit a4bae62bbcd9815b37e99561fe4672eb7424224c.