Revert 0faf1d2..183604b

This rolls back to commit 0faf1d220ca28437e0428c619100493e08efb60d.