Revert 193a789..0aef9ae

This rolls back to commit 193a789682fbdb047b755143e88a5686d4dfacd7.