Revert 2b04290..80cb153

This rolls back to commit 2b0429092277e1e0b17ca3139713c219d1e75f01.