Revert 0b8aba9..4239d53

This rolls back to commit 0b8aba98c9f6d266c87c00847c366e2d6be522fa.