Revert 12c653b..6677433

This rolls back to commit 12c653bb52ef2e392ee7124c1bcaad0f5be2e014.
Test