Revert a851cce..1787881

This rolls back to commit a851cce7c648cb270cc09a8d13d57ff9eab54762.