Revert f7482e3..28ecdef

This rolls back to commit f7482e33e6b52e21707bf808cb7863c38e86330d.