Revert b0c3128..55d88a5

This rolls back to commit b0c3128c48c18fbfe17413239876904299d1d26e.