Revert 14cbc60..877968a

This rolls back to commit 14cbc60c2fbf997cf732d7488b67b05ed2ce5b3e.