Revert 263aaca..5c8e4fa

This rolls back to commit 263aacad34af4e4620c36276125e62ff05f32bf7.